theme: Move endSessionDialog style into dialogs stylesheet

Since the style information of the end session dialog is now only a few
lines anymore, we can move it into the general stylesheet for dialogs.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/965

diff --git a/data/theme/gnome-shell-sass/_widgets.scss b/data/theme/gnome-shell-sass/_widgets.scss
index d2552c5b9d258e7e68b09215cf06ee3bc1b7270c..997fb8069e95bbb86458649de7b2d53536bb23d4 100644 (file)
--- a/data/theme/gnome-shell-sass/_widgets.scss
+++ b/data/theme/gnome-shell-sass/_widgets.scss
@@ -13,7 +13,6 @@
 @import 'widgets/corner-ripple';
 @import 'widgets/dash';
 @import 'widgets/dialogs';
-@import 'widgets/end-session-dialog';
 @import 'widgets/entries';
 @import 'widgets/hotplug';
 @import 'widgets/ibus-popup';
@@ -36,4 +35,4 @@
 @import 'widgets/switches';
 @import 'widgets/tiled-previews';
 @import 'widgets/window-picker';
-@import 'widgets/workspace-switcher';
\ No newline at end of file
+@import 'widgets/workspace-switcher';

diff --git a/data/theme/gnome-shell-sass/widgets/_dialogs.scss b/data/theme/gnome-shell-sass/widgets/_dialogs.scss
index 5b5fe207ecef6547d27321bfcd78afb3940871e2..8ce964a8b813a1575a000d721dd9c2c25aef0545 100644 (file)
--- a/data/theme/gnome-shell-sass/widgets/_dialogs.scss
+++ b/data/theme/gnome-shell-sass/widgets/_dialogs.scss
@@ -19,6 +19,15 @@
   @include fontsize($base_font_size + 3);
 }
 
+/* End Session Dialog */
+
+.end-session-dialog {
+  .end-session-dialog-battery-warning,
+  .dialog-list-title {
+    color: $warning_color;
+  }
+}
+
 /* Message Dialog */
 .message-dialog-content {
   spacing: 18px;

diff --git a/data/theme/gnome-shell-sass/widgets/_end-session-dialog.scss b/data/theme/gnome-shell-sass/widgets/_end-session-dialog.scss
deleted file mode 100644 (file)
index 0bca81b..0000000
--- a/data/theme/gnome-shell-sass/widgets/_end-session-dialog.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-/* End Session Dialog */
-
-$end_session_dialog_width: 28em;
-
-.end-session-dialog-battery-warning {
-  width: $end_session_dialog_width;
-  color: $warning_color;
-}
-
-.end-session-dialog .dialog-list-title {
-  color: $warning_color;
-}

diff --git a/data/theme/meson.build b/data/theme/meson.build
index d88e31b37fe544ccfc6904787b8b4c3a8a3acbf6..ec750ef19d77a4efc1dc857d4aa695566d831d42 100644 (file)
--- a/data/theme/meson.build
+++ b/data/theme/meson.build
@@ -14,7 +14,6 @@ theme_sources = files([
   'gnome-shell-sass/widgets/_corner-ripple.scss',
   'gnome-shell-sass/widgets/_dash.scss',
   'gnome-shell-sass/widgets/_dialogs.scss',
-  'gnome-shell-sass/widgets/_end-session-dialog.scss',
   'gnome-shell-sass/widgets/_entries.scss',
   'gnome-shell-sass/widgets/_hotplug.scss',
   'gnome-shell-sass/widgets/_ibus-popup.scss',